Merge tag 'upstream/3.6.1_20161102'
authorGert Wollny <gw.fossdev@gmail.com>
Mon, 7 Nov 2016 11:41:00 +0000 (12:41 +0100)
committerGert Wollny <gw.fossdev@gmail.com>
Mon, 7 Nov 2016 11:41:00 +0000 (12:41 +0100)
Upstream version 3.6.1~20161102


Trivial merge